From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 16 Jan 2026 02:25:25 +0000 (+0000)
Subject: Merge version 2.12.0-1+rpi1 and 2.12.0-2 to produce 2.12.0-2+rpi1
X-Git-Tag: archive/raspbian/2.12.0-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=ade0b766de8d123814a3770d49ef3e214082ddc4;p=cmus.git

Merge version 2.12.0-1+rpi1 and 2.12.0-2 to produce 2.12.0-2+rpi1
---

ade0b766de8d123814a3770d49ef3e214082ddc4
diff --cc debian/changelog
index 2129481,38283a5..6e1642d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- cmus (2.12.0-1+rpi1) trixie-staging; urgency=medium
++cmus (2.12.0-2+rpi1) forky-staging; urgency=medium
 +
 +  [changes brought forward from 2.8.0-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 19 Aug 2020 09:42:31 +0000]
 +  * Add armhf to list of libatomic architectures.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 19 Jun 2025 09:14:47 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 16 Jan 2026 02:25:25 +0000
++
+ cmus (2.12.0-2) unstable; urgency=medium
+ 
+   * Team upload
+   * Fix build with ffmpeg 8.0 (Closes: #1115013)
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Fri, 12 Sep 2025 23:00:35 +0200
  
  cmus (2.12.0-1) unstable; urgency=medium